home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1998-05-21 | 4.2 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
| Confidence | Program | Detection | Match Type | Support
|
|---|
| 1%
| dexvert
| Emacs Compiled Lisp (other/emacsCompiledLisp)
| magic
| Unsupported |
| 100%
| file
| Emacs/XEmacs v20 byte-compiled Lisp data
| default
| |
| 99%
| file
| data
| default
| |
| 100%
| TrID
| Emacs/XEmacs byte-compiled Lisp (generic)
| default
|
|
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 14 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6a 75 73 74 69 6e 62 |piled by| justinb|
|00000020| 40 65 62 6f 6e 79 2e 63 | 72 61 79 2e 63 6f 6d 20 |@ebony.c|ray.com |
|00000030| 6f 6e 20 4d 6f 6e 20 4d | 61 72 20 20 39 20 31 33 |on Mon M|ar 9 13|
|00000040| 3a 30 30 3a 34 39 20 31 | 39 39 38 0a 3b 3b 3b 20 |:00:49 1|998.;;; |
|00000050| 66 72 6f 6d 20 66 69 6c | 65 20 2f 68 6f 6d 65 2f |from fil|e /home/|
|00000060| 61 73 70 65 6e 30 37 2f | 6a 75 73 74 69 6e 62 2f |aspen07/|justinb/|
|00000070| 72 6f 6f 74 73 2f 66 72 | 65 65 77 61 72 65 2f 78 |roots/fr|eeware/x|
|00000080| 65 6d 61 63 73 2f 32 30 | 2e 33 2f 78 65 6d 61 63 |emacs/20|.3/xemac|
|00000090| 73 2d 32 30 2e 33 2f 6c | 69 73 70 2f 65 66 73 2f |s-20.3/l|isp/efs/|
|000000a0| 64 69 72 65 64 2d 64 69 | 66 66 2e 65 6c 0a 3b 3b |dired-di|ff.el.;;|
|000000b0| 3b 20 65 6d 61 63 73 20 | 76 65 72 73 69 6f 6e 20 |; emacs |version |
|000000c0| 32 30 2e 34 20 22 45 6d | 65 72 61 6c 64 22 20 58 |20.4 "Em|erald" X|
|000000d0| 45 6d 61 63 73 20 20 4c | 75 63 69 64 2e 0a 3b 3b |Emacs L|ucid..;;|
|000000e0| 3b 20 62 79 74 65 63 6f | 6d 70 20 76 65 72 73 69 |; byteco|mp versi|
|000000f0| 6f 6e 20 32 2e 32 35 20 | 58 45 6d 61 63 73 3b 20 |on 2.25 |XEmacs; |
|00000100| 32 32 2d 4d 61 72 2d 39 | 36 2e 0a 3b 3b 3b 20 6f |22-Mar-9|6..;;; o|
|00000110| 70 74 69 6d 69 7a 61 74 | 69 6f 6e 20 69 73 20 6f |ptimizat|ion is o|
|00000120| 6e 2e 0a 3b 3b 3b 20 74 | 68 69 73 20 66 69 6c 65 |n..;;; t|his file|
|00000130| 20 75 73 65 73 20 6f 70 | 63 6f 64 65 73 20 77 68 | uses op|codes wh|
|00000140| 69 63 68 20 64 6f 20 6e | 6f 74 20 65 78 69 73 74 |ich do n|ot exist|
|00000150| 20 69 6e 20 45 6d 61 63 | 73 20 31 39 2e 0a 0a 28 | in Emac|s 19...(|
|00000160| 69 66 20 28 61 6e 64 20 | 28 62 6f 75 6e 64 70 20 |if (and |(boundp |
|00000170| 27 65 6d 61 63 73 2d 76 | 65 72 73 69 6f 6e 29 0a |'emacs-v|ersion).|
|00000180| 09 20 28 6f 72 20 28 61 | 6e 64 20 28 62 6f 75 6e |. (or (a|nd (boun|
|00000190| 64 70 20 27 65 70 6f 63 | 68 3a 3a 76 65 72 73 69 |dp 'epoc|h::versi|
|000001a0| 6f 6e 29 20 65 70 6f 63 | 68 3a 3a 76 65 72 73 69 |on) epoc|h::versi|
|000001b0| 6f 6e 29 0a 09 20 20 20 | 20 20 28 73 74 72 69 6e |on).. | (strin|
|000001c0| 67 2d 6c 65 73 73 70 20 | 65 6d 61 63 73 2d 76 65 |g-lessp |emacs-ve|
|000001d0| 72 73 69 6f 6e 20 22 32 | 30 22 29 29 29 0a 20 20 |rsion "2|0"))). |
|000001e0| 20 20 28 65 72 72 6f 72 | 20 22 60 64 69 72 65 64 | (error| "`dired|
|000001f0| 2d 64 69 66 66 2e 65 6c | 27 20 77 61 73 20 63 6f |-diff.el|' was co|
|00000200| 6d 70 69 6c 65 64 20 66 | 6f 72 20 45 6d 61 63 73 |mpiled f|or Emacs|
|00000210| 20 32 30 22 29 29 0a 0a | 28 6f 72 20 28 62 6f 75 | 20"))..|(or (bou|
|00000220| 6e 64 70 20 27 63 75 72 | 72 65 6e 74 2d 6c 6f 61 |ndp 'cur|rent-loa|
|00000230| 64 2d 6c 69 73 74 29 20 | 28 73 65 74 71 20 63 75 |d-list) |(setq cu|
|00000240| 72 72 65 6e 74 2d 6c 6f | 61 64 2d 6c 69 73 74 20 |rrent-lo|ad-list |
|00000250| 6e 69 6c 29 29 0a 0a 0a | 28 62 79 74 65 2d 63 6f |nil))...|(byte-co|
|00000260| 64 65 20 22 c0 c1 21 88 | c2 c3 21 88 c4 0d 42 15 |de "..!.|..!...B.|
|00000270| c6 0d 42 15 c7 0d 42 15 | c8 0d 42 15 c0 87 22 20 |..B...B.|..B..." |
|00000280| 5b 70 72 6f 76 69 64 65 | 20 64 69 72 65 64 2d 64 |[provide| dired-d|
|00000290| 69 66 66 20 72 65 71 75 | 69 72 65 20 64 69 72 65 |iff requ|ire dire|
|000002a0| 64 20 65 6d 65 72 67 65 | 2d 6c 61 73 74 2d 64 69 |d emerge|-last-di|
|000002b0| 72 2d 69 6e 70 75 74 20 | 63 75 72 72 65 6e 74 2d |r-input |current-|
|000002c0| 6c 6f 61 64 2d 6c 69 73 | 74 20 65 6d 65 72 67 65 |load-lis|t emerge|
|000002d0| 2d 6c 61 73 74 2d 64 69 | 72 2d 6f 75 74 70 75 74 |-last-di|r-output|
|000002e0| 20 65 6d 65 72 67 65 2d | 6c 61 73 74 2d 64 69 72 | emerge-|last-dir|
|000002f0| 2d 61 6e 63 65 73 74 6f | 72 20 64 69 66 66 2d 73 |-ancesto|r diff-s|
|00000300| 77 69 74 63 68 65 73 5d | 20 32 29 0a 28 64 65 66 |witches]| 2).(def|
|00000310| 61 6c 69 61 73 20 27 64 | 69 72 65 64 2d 64 69 66 |alias 'd|ired-dif|
|00000320| 66 2d 72 65 61 64 2d 66 | 69 6c 65 2d 6e 61 6d 65 |f-read-f|ile-name|
|00000330| 20 23 5b 28 70 72 6f 6d | 70 74 29 20 22 c0 19 c2 | #[(prom|pt) "...|
|00000340| 20 ad 8a 8a c2 20 62 88 | c3 c4 c0 5c 22 29 1d c6 | .... b.|...\")..|
|00000350| c7 c8 0e 09 c3 ca 21 0d | ab 8b cb cc 0d cd 20 c0 |......!.|...... .|
|00000360| 23 ce 51 aa 81 cf 24 d0 | 20 0d c0 24 2a 87 22 20 |#.Q...$.| ..$*." |
|00000370| 5b 74 20 6d 61 72 6b 2d | 61 63 74 69 76 65 20 6d |[t mark-|active m|
|00000380| 61 72 6b 20 64 69 72 65 | 64 2d 67 65 74 2d 66 69 |ark dire|d-get-fi|
|00000390| 6c 65 6e 61 6d 65 20 6e | 69 6c 20 64 65 66 61 75 |lename n|il defau|
|000003a0| 6c 74 20 72 65 61 64 2d | 66 69 6c 65 2d 6e 61 6d |lt read-|file-nam|
|000003b0| 65 20 66 6f 72 6d 61 74 | 20 22 25 73 20 25 73 20 |e format| "%s %s |
|000003c0| 77 69 74 68 3a 20 25 73 | 22 20 70 72 6f 6d 70 74 |with: %s|" prompt|
|000003d0| 20 6e 6f 2d 64 69 72 20 | 22 5b 22 20 64 69 72 65 | no-dir |"[" dire|
|000003e0| 64 2d 6d 61 6b 65 2d 72 | 65 6c 61 74 69 76 65 20 |d-make-r|elative |
|000003f0| 64 69 72 65 64 2d 63 75 | 72 72 65 6e 74 2d 64 69 |dired-cu|rrent-di|
|00000400| 72 65 63 74 6f 72 79 20 | 22 5d 20 22 20 22 22 20 |rectory |"] " "" |
|00000410| 64 65 66 61 75 6c 74 2d | 64 69 72 65 63 74 6f 72 |default-|director|
|00000420| 79 5d 20 31 30 5d 29 0a | 28 64 65 66 61 6c 69 61 |y] 10]).|(defalia|
|00000430| 73 20 27 64 69 72 65 64 | 2d 64 69 66 66 2d 72 65 |s 'dired|-diff-re|
|00000440| 61 64 2d 73 77 69 74 63 | 68 65 73 20 23 5b 28 73 |ad-switc|hes #[(s|
|00000450| 77 69 74 63 68 70 72 6f | 6d 70 74 29 20 22 c0 c1 |witchpro|mpt) "..|
|00000460| 21 ac 84 c2 c3 21 88 09 | 3c ab 87 c4 c5 09 c6 23 |!....!..|<......#|
|00000470| aa 81 09 1e 07 c8 c9 0e | 5c 6e 0e 07 5c 22 0e 07 |........|\n..\"..|
|00000480| 5c 22 1e 0b cc cd 1e 0e | 1e 0f d0 d1 0e 0b 0e 0e |\"......|........|
|00000490| 23 ab 92 0e 0b d2 94 d2 | 95 4f 0e 0f 42 16 0f cd |#.......|.O..B...|
|000004a0| 95 16 0e aa 65 0e 0f 9f | 2c 87 22 20 5b 62 6f 75 |....e...|,." [bou|
|000004b0| 6e 64 70 20 64 69 66 66 | 2d 73 77 69 74 63 68 65 |ndp diff|-switche|
|000004c0| 73 20 72 65 71 75 69 72 | 65 20 64 69 66 66 20 6d |s requir|e diff m|
|000004d0| 61 70 63 6f 6e 63 61 74 | 20 69 64 65 6e 74 69 74 |apconcat| identit|
|000004e0| 79 20 22 20 22 20 64 65 | 66 61 75 6c 74 20 72 65 |y " " de|fault re|
|000004f0| 61 64 2d 73 74 72 69 6e | 67 20 66 6f 72 6d 61 74 |ad-strin|g format|
|00000500| 20 73 77 69 74 63 68 70 | 72 6f 6d 70 74 20 73 77 | switchp|rompt sw|
|00000510| 69 74 63 68 65 73 20 6e | 69 6c 20 30 20 73 74 61 |itches n|il 0 sta|
|00000520| 72 74 20 72 65 73 75 6c | 74 20 73 74 72 69 6e 67 |rt resul|t string|
|00000530| 2d 6d 61 74 63 68 20 22 | 5c 5c 28 5c 5c 53 2d 2b |-match "|\\(\\S-+|
|00000540| 5c 5c 29 22 20 31 5d 20 | 34 5d 29 0a 23 40 32 31 |\\)" 1] |4]).#@21|
|00000550| 37 20 43 6f 6d 70 61 72 | 65 20 66 69 6c 65 20 61 |7 Compar|e file a|
|00000560| 74 20 70 6f 69 6e 74 20 | 77 69 74 68 20 66 69 6c |t point |with fil|
|00000570| 65 20 46 49 4c 45 20 75 | 73 69 6e 67 20 60 64 69 |e FILE u|sing `di|
|00000580| 66 66 27 2e 0a 46 49 4c | 45 20 64 65 66 61 75 6c |ff'..FIL|E defaul|
|00000590| 74 73 20 74 6f 20 74 68 | 65 20 66 69 6c 65 20 61 |ts to th|e file a|
|000005a0| 74 20 74 68 65 20 6d 61 | 72 6b 2e 0a 54 68 65 20 |t the ma|rk..The |
|000005b0| 70 72 6f 6d 70 74 65 64 | 2d 66 6f 72 20 66 69 6c |prompted|-for fil|
|000005c0| 65 20 69 73 20 74 68 65 | 20 66 69 72 73 74 20 66 |e is the| first f|
|000005d0| 69 6c 65 20 67 69 76 65 | 6e 20 74 6f 20 60 64 69 |ile give|n to `di|
|000005e0| 66 66 27 2e 0a 57 69 74 | 68 20 61 20 70 72 65 66 |ff'..Wit|h a pref|
|000005f0| 69 78 20 61 6c 6c 6f 77 | 73 20 74 68 65 20 73 77 |ix allow|s the sw|
|00000600| 69 74 63 68 65 73 20 66 | 6f 72 20 74 68 65 20 64 |itches f|or the d|
|00000610| 69 66 66 20 70 72 6f 67 | 72 61 6d 20 74 6f 20 62 |iff prog|ram to b|
|00000620| 65 20 65 64 69 74 65 64 | 2e 1f 0a 28 64 65 66 61 |e edited|...(defa|
|00000630| 6c 69 61 73 20 27 64 69 | 72 65 64 2d 64 69 66 66 |lias 'di|red-diff|
|00000640| 20 23 5b 28 66 69 6c 65 | 20 26 6f 70 74 69 6f 6e | #[(file| &option|
|00000650| 61 6c 20 73 77 69 74 63 | 68 65 73 29 20 22 08 ab |al switc|hes) "..|
|00000660| 87 c1 5c 6e c3 20 08 23 | 87 c1 5c 6e c3 20 5c 22 |..\n. .#|..\n. \"|
|00000670| 87 22 20 5b 73 77 69 74 | 63 68 65 73 20 64 69 66 |." [swit|ches dif|
|00000680| 66 20 66 69 6c 65 20 64 | 69 72 65 64 2d 67 65 74 |f file d|ired-get|
|00000690| 2d 66 69 6c 65 6e 61 6d | 65 5d 20 34 20 28 23 24 |-filenam|e] 4 (#$|
|000006a0| 20 2e 20 31 33 36 32 29 | 20 28 6c 69 73 74 20 28 | . 1362)| (list (|
|000006b0| 64 69 72 65 64 2d 64 69 | 66 66 2d 72 65 61 64 2d |dired-di|ff-read-|
|000006c0| 66 69 6c 65 2d 6e 61 6d | 65 20 22 44 69 66 66 22 |file-nam|e "Diff"|
|000006d0| 29 20 28 61 6e 64 20 63 | 75 72 72 65 6e 74 2d 70 |) (and c|urrent-p|
|000006e0| 72 65 66 69 78 2d 61 72 | 67 20 28 64 69 72 65 64 |refix-ar|g (dired|
|000006f0| 2d 64 69 66 66 2d 72 65 | 61 64 2d 73 77 69 74 63 |-diff-re|ad-switc|
|00000700| 68 65 73 20 22 4f 70 74 | 69 6f 6e 73 20 66 6f 72 |hes "Opt|ions for|
|00000710| 20 64 69 66 66 3a 20 22 | 29 29 29 5d 29 0a 23 40 | diff: "|)))]).#@|
|00000720| 32 32 30 20 44 69 66 66 | 20 74 68 69 73 20 66 69 |220 Diff| this fi|
|00000730| 6c 65 20 77 69 74 68 20 | 69 74 73 20 62 61 63 6b |le with |its back|
|00000740| 75 70 20 66 69 6c 65 20 | 6f 72 20 76 69 63 65 20 |up file |or vice |
|00000750| 76 65 72 73 61 2e 0a 55 | 73 65 73 20 74 68 65 20 |versa..U|ses the |
|00000760| 6c 61 74 65 73 74 20 62 | 61 63 6b 75 70 2c 20 69 |latest b|ackup, i|
|00000770| 66 20 74 68 65 72 65 20 | 61 72 65 20 73 65 76 65 |f there |are seve|
|00000780| 72 61 6c 20 6e 75 6d 65 | 72 69 63 61 6c 20 62 61 |ral nume|rical ba|
|00000790| 63 6b 75 70 73 2e 0a 49 | 66 20 74 68 69 73 20 66 |ckups..I|f this f|
|000007a0| 69 6c 65 20 69 73 20 61 | 20 62 61 63 6b 75 70 2c |ile is a| backup,|
|000007b0| 20 64 69 66 66 20 69 74 | 20 77 69 74 68 20 69 74 | diff it| with it|
|000007c0| 73 20 6f 72 69 67 69 6e | 61 6c 2e 0a 54 68 65 20 |s origin|al..The |
|000007d0| 62 61 63 6b 75 70 20 66 | 69 6c 65 20 69 73 20 74 |backup f|ile is t|
|000007e0| 68 65 20 66 69 72 73 74 | 20 66 69 6c 65 20 67 69 |he first| file gi|
|000007f0| 76 65 6e 20 74 6f 20 60 | 64 69 66 66 27 2e 1f 0a |ven to `|diff'...|
|00000800| 28 64 65 66 61 6c 69 61 | 73 20 27 64 69 72 65 64 |(defalia|s 'dired|
|00000810| 2d 62 61 63 6b 75 70 2d | 64 69 66 66 20 23 5b 28 |-backup-|diff #[(|
|00000820| 26 6f 70 74 69 6f 6e 61 | 6c 20 73 77 69 74 63 68 |&optiona|l switch|
|00000830| 65 73 29 20 22 08 ab 86 | c1 c2 20 08 5c 22 87 c1 |es) "...|.. .\"..|
|00000840| c2 20 21 87 22 20 5b 73 | 77 69 74 63 68 65 73 20 |. !." [s|witches |
|00000850| 64 69 66 66 2d 62 61 63 | 6b 75 70 20 64 69 72 65 |diff-bac|kup dire|
|00000860| 64 2d 67 65 74 2d 66 69 | 6c 65 6e 61 6d 65 5d 20 |d-get-fi|lename] |
|00000870| 33 20 28 23 24 20 2e 20 | 31 38 32 38 29 20 28 6c |3 (#$ . |1828) (l|
|00000880| 69 73 74 20 28 61 6e 64 | 20 63 75 72 72 65 6e 74 |ist (and| current|
|00000890| 2d 70 72 65 66 69 78 2d | 61 72 67 20 28 64 69 72 |-prefix-|arg (dir|
|000008a0| 65 64 2d 64 69 66 66 2d | 72 65 61 64 2d 73 77 69 |ed-diff-|read-swi|
|000008b0| 74 63 68 65 73 20 22 44 | 69 66 66 20 77 69 74 68 |tches "D|iff with|
|000008c0| 20 73 77 69 74 63 68 65 | 73 3a 20 22 29 29 29 5d | switche|s: ")))]|
|000008d0| 29 0a 23 40 38 36 20 4d | 65 72 67 65 20 66 69 6c |).#@86 M|erge fil|
|000008e0| 65 20 61 74 20 70 6f 69 | 6e 74 20 77 69 74 68 20 |e at poi|nt with |
|000008f0| 46 49 4c 45 20 75 73 69 | 6e 67 20 60 65 6d 65 72 |FILE usi|ng `emer|
|00000900| 67 65 27 2e 0a 46 49 4c | 45 20 64 65 66 61 75 6c |ge'..FIL|E defaul|
|00000910| 74 73 20 74 6f 20 74 68 | 65 20 66 69 6c 65 20 61 |ts to th|e file a|
|00000920| 74 20 74 68 65 20 6d 61 | 72 6b 2e 1f 0a 28 64 65 |t the ma|rk...(de|
|00000930| 66 61 6c 69 61 73 20 27 | 64 69 72 65 64 2d 65 6d |falias '|dired-em|
|00000940| 65 72 67 65 20 23 5b 28 | 61 72 67 20 66 69 6c 65 |erge #[(|arg file|
|00000950| 20 6f 75 74 2d 66 69 6c | 65 29 20 22 c0 09 5c 6e | out-fil|e) "..\n|
|00000960| c3 20 0c 24 87 22 20 5b | 65 6d 65 72 67 65 2d 66 |. .$." [|emerge-f|
|00000970| 69 6c 65 73 20 61 72 67 | 20 66 69 6c 65 20 64 69 |iles arg| file di|
|00000980| 72 65 64 2d 67 65 74 2d | 66 69 6c 65 6e 61 6d 65 |red-get-|filename|
|00000990| 20 6f 75 74 2d 66 69 6c | 65 5d 20 35 20 28 23 24 | out-fil|e] 5 (#$|
|000009a0| 20 2e 20 32 32 36 33 29 | 20 28 6c 65 74 20 28 28 | . 2263)| (let ((|
|000009b0| 66 69 6c 65 20 28 64 69 | 72 65 64 2d 64 69 66 66 |file (di|red-diff|
|000009c0| 2d 72 65 61 64 2d 66 69 | 6c 65 2d 6e 61 6d 65 20 |-read-fi|le-name |
|000009d0| 22 4d 65 72 67 65 22 29 | 29 29 20 28 6c 69 73 74 |"Merge")|)) (list|
|000009e0| 20 63 75 72 72 65 6e 74 | 2d 70 72 65 66 69 78 2d | current|-prefix-|
|000009f0| 61 72 67 20 66 69 6c 65 | 20 28 61 6e 64 20 63 75 |arg file| (and cu|
|00000a00| 72 72 65 6e 74 2d 70 72 | 65 66 69 78 2d 61 72 67 |rrent-pr|efix-arg|
|00000a10| 20 28 65 6d 65 72 67 65 | 2d 72 65 61 64 2d 66 69 | (emerge|-read-fi|
|00000a20| 6c 65 2d 6e 61 6d 65 20 | 22 4f 75 74 70 75 74 20 |le-name |"Output |
|00000a30| 66 69 6c 65 22 20 65 6d | 65 72 67 65 2d 6c 61 73 |file" em|erge-las|
|00000a40| 74 2d 64 69 72 2d 6f 75 | 74 70 75 74 20 28 64 69 |t-dir-ou|tput (di|
|00000a50| 72 65 64 2d 61 62 62 72 | 65 76 69 61 74 65 2d 66 |red-abbr|eviate-f|
|00000a60| 69 6c 65 2d 6e 61 6d 65 | 20 66 69 6c 65 29 20 66 |ile-name| file) f|
|00000a70| 69 6c 65 29 29 29 29 5d | 29 0a 23 40 31 30 31 20 |ile))))]|).#@101 |
|00000a80| 4d 65 72 67 65 20 66 69 | 6c 65 20 61 74 20 70 6f |Merge fi|le at po|
|00000a90| 69 6e 74 20 77 69 74 68 | 20 46 49 4c 45 2c 20 75 |int with| FILE, u|
|00000aa0| 73 69 6e 67 20 61 20 63 | 6f 6d 6d 6f 6e 20 41 4e |sing a c|ommon AN|
|00000ab0| 43 45 53 54 4f 52 20 66 | 69 6c 65 2e 0a 46 49 4c |CESTOR f|ile..FIL|
|00000ac0| 45 20 64 65 66 61 75 6c | 74 73 20 74 6f 20 74 68 |E defaul|ts to th|
|00000ad0| 65 20 66 69 6c 65 20 61 | 74 20 74 68 65 20 6d 61 |e file a|t the ma|
|00000ae0| 72 6b 2e 1f 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |rk...(de|falias '|
|00000af0| 64 69 72 65 64 2d 65 6d | 65 72 67 65 2d 77 69 74 |dired-em|erge-wit|
|00000b00| 68 2d 61 6e 63 65 73 74 | 6f 72 20 23 5b 28 61 72 |h-ancest|or #[(ar|
|00000b10| 67 20 66 69 6c 65 20 61 | 6e 63 65 73 74 6f 72 20 |g file a|ncestor |
|00000b20| 66 69 6c 65 2d 6f 75 74 | 29 20 22 c0 09 5c 6e c3 |file-out|) "..\n.|
|00000b30| 20 0c 0d 25 87 22 20 5b | 65 6d 65 72 67 65 2d 66 | ..%." [|emerge-f|
|00000b40| 69 6c 65 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |iles-wit|h-ancest|
|00000b50| 6f 72 20 61 72 67 20 66 | 69 6c 65 20 64 69 72 65 |or arg f|ile dire|
|00000b60| 64 2d 67 65 74 2d 66 69 | 6c 65 6e 61 6d 65 20 61 |d-get-fi|lename a|
|00000b70| 6e 63 65 73 74 6f 72 20 | 66 69 6c 65 2d 6f 75 74 |ncestor |file-out|
|00000b80| 5d 20 36 20 28 23 24 20 | 2e 20 32 36 38 38 29 20 |] 6 (#$ |. 2688) |
|00000b90| 28 6c 65 74 20 28 28 66 | 69 6c 65 20 28 64 69 72 |(let ((f|ile (dir|
|00000ba0| 65 64 2d 64 69 66 66 2d | 72 65 61 64 2d 66 69 6c |ed-diff-|read-fil|
|00000bb0| 65 2d 6e 61 6d 65 20 22 | 4d 65 72 67 65 22 29 29 |e-name "|Merge"))|
|00000bc0| 29 20 28 6c 69 73 74 20 | 63 75 72 72 65 6e 74 2d |) (list |current-|
|00000bd0| 70 72 65 66 69 78 2d 61 | 72 67 20 66 69 6c 65 20 |prefix-a|rg file |
|00000be0| 28 65 6d 65 72 67 65 2d | 72 65 61 64 2d 66 69 6c |(emerge-|read-fil|
|00000bf0| 65 2d 6e 61 6d 65 20 22 | 41 6e 63 65 73 74 6f 72 |e-name "|Ancestor|
|00000c00| 20 66 69 6c 65 22 20 65 | 6d 65 72 67 65 2d 6c 61 | file" e|merge-la|
|00000c10| 73 74 2d 64 69 72 2d 61 | 6e 63 65 73 74 6f 72 20 |st-dir-a|ncestor |
|00000c20| 6e 69 6c 20 66 69 6c 65 | 29 20 28 61 6e 64 20 63 |nil file|) (and c|
|00000c30| 75 72 72 65 6e 74 2d 70 | 72 65 66 69 78 2d 61 72 |urrent-p|refix-ar|
|00000c40| 67 20 28 65 6d 65 72 67 | 65 2d 72 65 61 64 2d 66 |g (emerg|e-read-f|
|00000c50| 69 6c 65 2d 6e 61 6d 65 | 20 22 4f 75 74 70 75 74 |ile-name| "Output|
|00000c60| 20 66 69 6c 65 22 20 65 | 6d 65 72 67 65 2d 6c 61 | file" e|merge-la|
|00000c70| 73 74 2d 64 69 72 2d 6f | 75 74 70 75 74 20 28 64 |st-dir-o|utput (d|
|00000c80| 69 72 65 64 2d 61 62 62 | 72 65 76 69 61 74 65 2d |ired-abb|reviate-|
|00000c90| 66 69 6c 65 2d 6e 61 6d | 65 20 66 69 6c 65 29 20 |file-nam|e file) |
|00000ca0| 66 69 6c 65 29 29 29 29 | 5d 29 0a 23 40 37 31 20 |file))))|]).#@71 |
|00000cb0| 45 64 69 66 66 20 66 69 | 6c 65 20 61 74 20 70 6f |Ediff fi|le at po|
|00000cc0| 69 6e 74 20 77 69 74 68 | 20 46 49 4c 45 2e 0a 46 |int with| FILE..F|
|00000cd0| 49 4c 45 20 64 65 66 61 | 75 6c 74 73 20 74 6f 20 |ILE defa|ults to |
|00000ce0| 74 68 65 20 66 69 6c 65 | 20 61 74 20 74 68 65 20 |the file| at the |
|00000cf0| 6d 61 72 6b 2e 1f 0a 28 | 64 65 66 61 6c 69 61 73 |mark...(|defalias|
|00000d00| 20 27 64 69 72 65 64 2d | 65 64 69 66 66 20 23 5b | 'dired-|ediff #[|
|00000d10| 28 66 69 6c 65 29 20 22 | c0 09 c2 20 5c 22 87 22 |(file) "|... \"."|
|00000d20| 20 5b 65 64 69 66 66 2d | 66 69 6c 65 73 20 66 69 | [ediff-|files fi|
|00000d30| 6c 65 20 64 69 72 65 64 | 2d 67 65 74 2d 66 69 6c |le dired|-get-fil|
|00000d40| 65 6e 61 6d 65 5d 20 33 | 20 28 23 24 20 2e 20 33 |ename] 3| (#$ . 3|
|00000d50| 32 34 38 29 20 28 6c 69 | 73 74 20 28 64 69 72 65 |248) (li|st (dire|
|00000d60| 64 2d 64 69 66 66 2d 72 | 65 61 64 2d 66 69 6c 65 |d-diff-r|ead-file|
|00000d70| 2d 6e 61 6d 65 20 22 45 | 64 69 66 66 22 29 29 5d |-name "E|diff"))]|
|00000d80| 29 0a 23 40 33 37 20 50 | 61 74 63 68 20 66 69 6c |).#@37 P|atch fil|
|00000d90| 65 20 61 74 20 70 6f 69 | 6e 74 20 75 73 69 6e 67 |e at poi|nt using|
|00000da0| 20 60 65 70 61 74 63 68 | 27 2e 1f 0a 28 64 65 66 | `epatch|'...(def|
|00000db0| 61 6c 69 61 73 20 27 64 | 69 72 65 64 2d 65 70 61 |alias 'd|ired-epa|
|00000dc0| 74 63 68 20 23 5b 28 66 | 69 6c 65 29 20 22 08 ab |tch #[(f|ile) "..|
|00000dd0| 84 c1 08 21 87 c2 c3 21 | 87 22 20 5b 66 69 6c 65 |...!...!|." [file|
|00000de0| 20 65 64 69 66 66 2d 70 | 61 74 63 68 2d 66 69 6c | ediff-p|atch-fil|
|00000df0| 65 20 6d 65 73 73 61 67 | 65 20 22 4e 6f 20 66 69 |e messag|e "No fi|
|00000e00| 6c 65 20 70 61 74 63 68 | 65 64 2e 22 5d 20 32 20 |le patch|ed."] 2 |
|00000e10| 28 23 24 20 2e 20 33 34 | 36 33 29 20 28 6c 65 74 |(#$ . 34|63) (let|
|00000e20| 20 28 28 66 69 6c 65 20 | 28 64 69 72 65 64 2d 67 | ((file |(dired-g|
|00000e30| 65 74 2d 66 69 6c 65 6e | 61 6d 65 29 29 29 20 28 |et-filen|ame))) (|
|00000e40| 6c 69 73 74 20 28 61 6e | 64 20 28 6f 72 20 28 6d |list (an|d (or (m|
|00000e50| 65 6d 71 20 27 70 61 74 | 63 68 20 64 69 72 65 64 |emq 'pat|ch dired|
|00000e60| 2d 6e 6f 2d 63 6f 6e 66 | 69 72 6d 29 20 28 79 2d |-no-conf|irm) (y-|
|00000e70| 6f 72 2d 6e 2d 70 20 28 | 66 6f 72 6d 61 74 20 22 |or-n-p (|format "|
|00000e80| 50 61 74 63 68 20 25 73 | 3f 20 22 20 28 66 69 6c |Patch %s|? " (fil|
|00000e90| 65 2d 6e 61 6d 65 2d 6e | 6f 6e 64 69 72 65 63 74 |e-name-n|ondirect|
|00000ea0| 6f 72 79 20 66 69 6c 65 | 29 29 29 29 20 66 69 6c |ory file|)))) fil|
|00000eb0| 65 29 29 29 5d 29 0a 23 | 40 31 37 20 44 69 66 66 |e)))]).#|@17 Diff|
|00000ec0| 20 74 77 6f 20 66 69 6c | 65 73 2e 1f 0a 28 61 75 | two fil|es...(au|
|00000ed0| 74 6f 6c 6f 61 64 20 27 | 64 69 66 66 20 22 64 69 |toload '|diff "di|
|00000ee0| 66 66 22 20 27 28 23 24 | 20 2e 20 33 37 37 32 29 |ff" '(#$| . 3772)|
|00000ef0| 20 74 29 0a 23 40 34 37 | 20 44 69 66 66 20 74 68 | t).#@47| Diff th|
|00000f00| 69 73 20 66 69 6c 65 20 | 77 69 74 68 20 69 74 73 |is file |with its|
|00000f10| 20 62 61 63 6b 75 70 20 | 6f 72 20 76 69 63 65 20 | backup |or vice |
|00000f20| 76 65 72 73 61 2e 1f 0a | 28 61 75 74 6f 6c 6f 61 |versa...|(autoloa|
|00000f30| 64 20 27 64 69 66 66 2d | 62 61 63 6b 75 70 20 22 |d 'diff-|backup "|
|00000f40| 64 69 66 66 22 20 27 28 | 23 24 20 2e 20 33 38 33 |diff" '(|#$ . 383|
|00000f50| 33 29 20 74 29 0a 23 40 | 31 38 20 4d 65 72 67 65 |3) t).#@|18 Merge|
|00000f60| 20 74 77 6f 20 66 69 6c | 65 73 2e 1f 0a 28 61 75 | two fil|es...(au|
|00000f70| 74 6f 6c 6f 61 64 20 27 | 65 6d 65 72 67 65 2d 66 |toload '|emerge-f|
|00000f80| 69 6c 65 73 20 22 65 6d | 65 72 67 65 22 20 27 28 |iles "em|erge" '(|
|00000f90| 23 24 20 2e 20 33 39 33 | 31 29 20 74 29 0a 23 40 |#$ . 393|1) t).#@|
|00000fa0| 34 33 20 4d 65 72 67 65 | 20 74 77 6f 20 66 69 6c |43 Merge| two fil|
|00000fb0| 65 73 20 68 61 76 69 6e | 67 20 61 20 63 6f 6d 6d |es havin|g a comm|
|00000fc0| 6f 6e 20 61 6e 63 65 73 | 74 6f 72 2e 1f 0a 28 61 |on ances|tor...(a|
|00000fd0| 75 74 6f 6c 6f 61 64 20 | 27 65 6d 65 72 67 65 2d |utoload |'emerge-|
|00000fe0| 66 69 6c 65 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |files-wi|th-ances|
|00000ff0| 74 6f 72 20 22 65 6d 65 | 72 67 65 22 20 27 28 23 |tor "eme|rge" '(#|
|00001000| 24 20 2e 20 34 30 30 33 | 29 20 74 29 0a 28 61 75 |$ . 4003|) t).(au|
|00001010| 74 6f 6c 6f 61 64 20 27 | 65 6d 65 72 67 65 2d 72 |toload '|emerge-r|
|00001020| 65 61 64 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 22 65 |ead-file|-name "e|
|00001030| 6d 65 72 67 65 22 29 0a | 23 40 31 38 20 45 64 69 |merge").|#@18 Edi|
|00001040| 66 66 20 74 77 6f 20 66 | 69 6c 65 73 2e 1f 0a 28 |ff two f|iles...(|
|00001050| 61 75 74 6f 6c 6f 61 64 | 20 27 65 64 69 66 66 2d |autoload| 'ediff-|
|00001060| 66 69 6c 65 73 20 22 65 | 64 69 66 66 22 20 27 28 |files "e|diff" '(|
|00001070| 23 24 20 2e 20 34 31 35 | 37 29 20 74 29 0a 23 40 |#$ . 415|7) t).#@|
|00001080| 31 35 20 50 61 74 63 68 | 20 61 20 66 69 6c 65 2e |15 Patch| a file.|
|00001090| 1f 0a 28 61 75 74 6f 6c | 6f 61 64 20 27 65 64 69 |..(autol|oad 'edi|
|000010a0| 66 66 2d 70 61 74 63 68 | 2d 66 69 6c 65 20 22 65 |ff-patch|-file "e|
|000010b0| 64 69 66 66 22 20 27 28 | 23 24 20 2e 20 34 32 32 |diff" '(|#$ . 422|
|000010c0| 37 29 20 74 29 0a | |7) t). | |
+--------+-------------------------+-------------------------+--------+--------+
